Sorting out comments before script move