Code clean up, added more path to app.config