refactoring mania -- ahhhhhhh.