Applied Renaming Changes
Enhanced formatter module