Yes, would be simpler and clearer