Cleanup #6

Mostly refining code style and language usage.