cleaning up this crap while I'm here