Code-Style refactoring