Better removal of whitespace.