FeatureEnvy: custom -> design
FeatureEnvy: Header ordering
FeatureEnvy: Comment out all C++ analysis
FeatureEnvy: clean ups

* self_messages -> selfMessage for consistent style
* Add missing white space
* Remove unused methods
* Remove unnecessary temporaries