A ton of improvments in formatting and unused variables.