Refactor Schmefactor