Minor refactoring, removing SubjectDescriptionFacade