refactor dev