No point in needlessly complicating the code, it was fine as it were even though it was a bit verbose.

Though you can keep the folder name changes.