Refactorings on MainActivity