Refactor style