code refactoring in process