Little less OOP