Get rid of idiotic double assignment
Remove vacuous comments