More descriptive names for config struct
Cleanup