Refactoried Controller activity