Tidy require statements.
Update main module exports.
0.8.223