Style Changes

to comply with [Google Style
Guide](http://google-styleguide.googlecode.com/svn/trunk/pyguide.html)