Cosmetics.
Started a refactor to avoid mapping backward too much.

INCOMPLETE