Refactored common formatter logic
Packaged version 2.5.0.330