Refactoring variables. Main variables to class variables.Better names