Refactored

A step toward respecting Single Responsability principle