Literalwidths

Widen literal widths if required (and reduce some scalastyle warnings).