cleanup and simplify

because YOLO