Correct JSON representation, cleanup