Rearrange the source
Added comments to make inspections ignore lines that give inspection errors that are not relevant