Back to a less OOP style.