Make the class declarations a bit tidier for the multiline classes