Updating coding guidelines, mild changes to code to comply