I think it's simple enough. Regardless, there's more refactoring in the works.