Simplifying json structure