Remove extra whitespace where it is not needed