ENH: Config cleanup and adding __contains__