nice needs clean up