minor renaming
minor restructuring