small refactor starting