Yes, I thought it was overly complex for just a couple of methods. I have refactored this which removes 4 files from the repo. :)