Altered comments to be more usefull, fixed names after refactor mistake.
mend

Altered comments to be more usefull, fixed names after refactor mistake, removed unused class, optimized imports