comment and whitespace cleanup on json improvements