Get better.ceu to only use two classes (and one interface)