ModularPots: Refactoring