tidy up
re-thinking json structure