styling changes

http://www.reddit.com/r/learnpython/comments/26knvp/critique_and_help_me_make_this_more_idiomatic/