simplify the default agent logic
code cleanups