Code Standardization

Changed the code to match the code standard a little more closely