Some further refactoring, and make sure module exports nothing.