Split up a few longer lines