Refactor draw method on map