cleaned up Thing