Yes, that seems better, I've updated the method.