cleaning up some stuff to save time while presenting