Spa/refactoring