Some comments & renaming of some functions