Added Comments and changed JSON Response to be valid (Code Cleanup)