* minor refactor