Refacctor some internal objects.