Dev refactor