cleaning up comments

we should think about making this object oriented