Removed redundant code, name changes to fields in results JSON