refactor, less config