Tidy up line-lengths and layout