Tidy dangling whitespace
Minor reorganization