implemented configuration files & clean up