clean up class a little