refactoring names and formatting