Some general cleanup.
Split some lines.
Merge pull request #172 from dnephin/r0.5.2_some_cleanup

Some general cleanup.