Refactor the agent to be a little bit more opinionated