Change to final class
Refactoring