Changed to JSON settings file, cleaned up the code some as well
Changed to JSON settings file, cleaned up the code some as well