Helper methods refactoring

Refactoring of the helpers method in order to follow the best practices

Unit testing the helpers which was not tested