Refactoring Gdd2011