More Refactoring of Controller