Code cleanup; Split config file