attempting some clean up