Working on new mapping keys for formating code