Fix lines too long issues