Fix error, cleanup class.