Fixed generation of lists for settings, abstracted some out to utilities file