Fix indent and remove debug code