reorganized, removed settings. house keeping