refactored and added conf.properties