Refactoring: Restructoring methods