Added key mappings and whitespace removal