! a couple of refactoring errors I feel