Refactor mosca