Cleanup behaviors internals
Merge pull request #1005 from jasonLaster/behaviors-stuff

Cleanup behaviors internals