cleanup whitespace etc