Dirty whitespace cleanup
long line cleanup
Merge pull request #259 from axsh/trivial-code-cleanup

Trivial code cleanup