Worked on refactor.