refactor names and comments