Cleanup & rewording