Remove Boilerplate added by decompiler
Merge pull request #3 from saladoc/refactor

Addition to prematurely merged PR #2