Formatting and json fixes