Code clean up in the V2 techs
Merge pull request #373 from bem/techs-v2

Code clean up in the V2 techs