Refactoring Baecker