Fix lint errors caused by lines over 80 chars