Some format improvements.