[dogfooding][cleanup] Use static inner class clean up for compare cocde

Using this cleanup brings:
- It reviews the feature
 - For optimization: small memory usage reduction as the outer pointer
is removed

Change-Id: I8f1bdcb09e0e654683c0cb5e26c8370d6a47638e
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>