Creating maps and reordering the code