some renamings
some cleanup
Merge pull request #51 from ffrensch/master

some renamings