Cleaning this up, then.