Fix whitespace issues to satisfy: make tidy