Code clean up for Style cop rules