Move missplaced comment, remove unneed &'s