commenting, cleaning up