Code Standard Cleanup