cleaned up controller and payment serializer