Removed unnecessary code
Changed display of current configuration