zwave: cosmetic editing for style consistency