tidy up of code line lengths