more comments + cleaning