tidying the code width throughout