housecleaning
refactored config parsing