Clarity
More clarity :P
Removed legacy var
Fixed module instantiation
TDD setup