minor changes

- used UNDEFINED instead of undefined
- merged moduleMains with modules