refactoring variable names and comments and