Clean up class method return types