Spa refactor