Code-style + refactoring