Make a long line shorter, fix lint error