Minor changes

more renaming, removing contents