Cleanup whitespaces