OOP-homewroks - Some small changes