Updated according to code standard
In preparation for merge with Development, we needed to update the code
according to our code standard.