Cleanup more whitespaces.