Cleaning up dangling whitespace, mis-aligned lines