Refactor masss