OOP tidiness sort of