Remove white space issues