Cleaning up some angry sounding parts