Refactoring of Control
Refactoring of Controller