Re-styled and re-structured the mapping step