Refactor: renamed variables, reduced module exports