Removed OOP-way, it was a dumb move after all.