minor refactor...really, I mean it