Removing DefaultController
Refactoring removing useless linereturn
Refactoring