small refactor and dev build