More Style Cop fixing