reformat code
fix failing tests
Merge branch 'defusecleanup' of github.com:aJanker/TypeChef into defusecleanup