Refactoring: Reduce Method Size and Fix Feature Envy