Clean up TargetAreaObject add/remove resource

* Save a map access
* Refactor into methods