Hi, Much nicer and easier to understand. Thanks for that.
If you want to clean up the code go for it but try and commit in small bits explaining each change so the changes can be reviewed easily. We currently not running unit test for this code so need to be a little careful in making changes. Thanks, Justin