Adding comments renaming internal method