Refactor style fixing