Dev refactoring