settings_spec can now be ran individually
Minor code cleanup