Fix whitespace and remove comment lines