Remove commented lines, minor formatting