Cleaned up some whitespace issues