Make manual formatting slightly nicer