Cleaning up whitespaces etc.