JSON output + code cleanup
Images changed