That would indeed be neater... suggest to first merge and move onto new non-dev xray before tackling this though?