YOLO coded, cleanup