Refactored in classes