cleanup commenting and smaller bits