more awesome refactoring, she's pretty clean