fixed cleaning up values