refactoring, added dev env