Java-OOP-Homework improvements