Cleaned up and rearranged Config.