Merge "Polish domain and repository for use in UI" into main