style and standardization refactoring