cleanup return types