Cleaned up whitespace and removed comments