najor refactor