yes, I am refactoring code