Small tweaks
Don't use module object in CommonJS

Fixes #308
Fixes #285
Rename variable