devbuild, refactoring