Refactoring

Thinned out mappings and settings.
Changed README