Style refactoring part 1