commenting / clean up