small refactor, cleaned up