Refactoring Amnesic and Couchie