Cleaned up Config subsets and grammer