whoa. refactoring! now it's mo' right