Code formatting tweaks
Client code formatting and tweaks
Add json formatter