Cleaning up (stylecop)