[TASK] Removed unused variables and made exports more semantic