Formatting and better JSON unmarshalling