Yes, that looks simple and easier to understand.