Style refactor