Massa refactoring.