Minor whitespace cleanup and incremental pylint prettification