Follow the node module pattern more closely