Refactor map options