refactoring of variables and comments