Cleaned up whitespaces