Improve removal of whitespaces a bit more