close #48 - Refactoring Controllers removing duplicated code