Merge pull request #2 from HTBox/master

local pull
refactoring around only passing what's needed
refactorings, mostly method signatures adjustments
Merge pull request #118 from moranlf/refactoring

Refactoring