Minor cleanup and renaming configSettings to settings