Misc changes to comply with google python style guide