More cleanup. Fix formatting.