refactoring naming of variables and methods
fix little bugs