Code cleanup, begin implementing query result tuple in JSON, new screenshot