Style refactor part 2