This commit is done taking in consideration several points:

1- Method Metrics
2- Method Naming Convention