Some improvements and removal of blank lines.