Refactor module exports