Refactored and sealed classes