-Some comments & renaming