clean up the class a bit