Fix white space issues