That's fair enough. I'll put in a task to tidy up the code base