beginnings of cleanup effor
further clean up