Some renaming/small lemmas completed/cleaning