Refactoring after @Alternatives introduction