Minor cleanup, ordering and mapping fix