further cleaning up of behavior fragment