Tidy up of code to comply with style guide.