removed unused mappings variable and cleaned up tabs/spacing