beginning commenting, some clean up