removed commented code
some more cosmetics