Improved config key naming
Removed default config values from the code