Dev mode option + refactoring.