Good point on the module encapsulation. Leave it as-is. :)