Fix line lenghts and improve readability

Cane tests should now all pass.