Minor formatting change.
Further simplification.
Some initial map definition logic.