Fixed up the config so it is not as messy.