cw1: Style refactors