refactor for dev env
aesthetics