Remove unneeded var
Clean up and reformat a few lines