removed code in comments
inserted changes from review with Jens