Cleanup

General typo and style cleanup.