Cleanup.
some comments... here.... and there....