got rid of extra settings and more cleanly defined each setting