Fix variable naming issue. Fix formatting a bit.