small refactoring, delegate more work to yaoc mapper