move comments to same line as fields