Core cleaning

Arranging config values on a config object