fix + clean up + comments