shortened some things, changed structure.
Merge pull request #1 from Timmaeh/patch-1

shortened some things, changed structure.