Cleaned up some inconsistent use of whitespace