more commenting/cleaning