an attempt at organizing things and some clean up