Refactoring after recent merge