Fix long line smells