Fix pending and too long lines

This should put us at a good place.