Fix white spaces