Redone class, java-style