Fix a large amount of whitespace issues in the code

Fix a large amount of whitespace issues in the code #2187