Cleaning up whitespaces