Cleanup and comments; also start prepping for RFID reader.