Clean up remove whitespaces