Cleanup: basic module pattern