Fixing mapping file and formatting issues