Use consistent naming
Tweak format representation