Removed unused variables and made module exports more semantic

[TASK] Removed unused variables and made exports more semantic