Allow popup to be disabled
Strict conversion and code cleanup for exports module library