removed comments and whitespace