minor refactor to existing features