Coding style changes

Here are couple of coding style fixes I've done on top of your work. Hope this will help you get a hang of the coding styles we use.