refactor
agent work
cleanup