commenting, clean up