minor refactor;