Code convention fixes

Code cleanup as per gnome coding guidelines

https://bugzilla.gnome.org/show_bug.cgi?id=738922