refactor mars