Fixed line lenght issues