Code clean up
Update config URL