Tidied up line lengths