Made fixes

[TASK] Removed unused variables and made module exports more semantic

[TASK] Removed unused variables and made exports more semantic
Merge branch 'merge' of github.com:b1nd/Ghost into merge