1.1 cleanup

Basic whitespace, documentation, and code cleanup.