renaming functions and variables names and removing (and changing)some comentaries