clean up json section, re-arrange