minor refactoring
minor refactoring
Refactoring agent.