Dev refactorings