Clean up and finish Kiosk class

There was some redundancy because I merged it poorly