Tightened up code, because yolo