make initial changes in refactor