Cleaning up the configurations + ability to override configs