changed comment styles, removed commented code