try to simplify the class a bit