Refactored the class to express its real responsability