Updated to code standard
In preparation for review we needed to update the code according to our code
standard.