Tidied up long lines