cleaning globals (lodash)
refactoring p2
tests