-Organize setting settings from settings file
-Some cleanup