Map customlabelformatter better to existing formats
Use inner class pattern to encapsulate useful formats
Conform to new customlabelformatter interface