typo
improved naming of some parameters
improve comments consistency
improved some parameters naming