refactoring: changed some variable names, made code more readable and enhanced some functions