Removed redundant mappings, tweaked thesis shortcut