I'm not talking about functional changes, just refactoring for clarity. Which definitely has to be on the cards once you start messing around with the layout of some code. If you're really not happy to give that a go then I'd rather you revert your changes to this section.