further removal of dead code, general cleaning and grokings
Merge pull request #2 from pietdaniel/refactorings

further removal of dead code, general cleaning and grokings