Merge pull request #18 from dragos-dumi/master

Removed some commented old code
Refactored field_threats
Merge pull request #19 from cristiroma/master

Refactored field_threats
Refactored field in code
Merge pull request #20 from cristiroma/master

Refactored field in code