Tidy the source
Eclipse inspired cleanups