Code cleanup
Used config files