sort out whitespace a bit