cleanup more  whitespace