Cleaning up misc whitespace issues