CS - Fixed Coding Standard Issues