restore my changes from a decompiled version. That means the commit history is lost. Sorry.
Merge pull request #2 from saladoc/refactor

Refactoring of existing Functions
Remove Boilerplate added by decompiler
Merge pull request #3 from saladoc/refactor

Addition to prematurely merged PR #2