More cleanup of formatting