Make lint clean

Please make the repository lint clean. No further changes will be merged without first resolving this issue in a separate MR.