some clean up - possible changes to be made for how drawing things work