refactoring variables names and comenting methods