small refactor before I jump into states