more comments + clean up