Refactoring, Commenting
Adds docu