refactoring at workplace