Refactoring: style errors