[TASK] Add missing @throws annotations
[TASK] Remove unused variables
[DOC] Typo in comment
[TASK] Remove superfluous return statement
[TASK] Correct @param annotations
[TASK] Correct variable name
[TASK] Remove superfluous quotes
[TASK] Adhere coding guidelines
[TASK] Correct @param annotation
Merge pull request #156 from bjo3rnf/housekeeping

[TASK] More code cleaning