Moved unnecessary functions out of the type class