ENH: updated so the configuration looks cleaner.