FeatureEnvy: clean ups

* Remove unnecessary temporaries
* Use find method instead of manually searching.
* Clean up types
* Remove unnecessary clear()