Refactor map out