Minor cleanup and regroup of configurations