Code refactor

Updating names of the methods