remove commented lines, rearrange things a bit