Cleaned up whitespace issues