Add JSON formatter
Use consistent variable names