Additional domain object and further detail view cleanup.