really pushing the refactor, even deleted an interface and made its one method static