code clean up
_references replaced