This looks fine so far for me, making this a generated fixture is the only left blocker from my side.