More cleanup of format chart