Cleaned up white spaces