Style fixes.
Style and py3 simplifications.