Fix my bad formatting changes...

as well as remove the unneeded mut and commented out code.