Schön refactored