Initialization fixes and remove stray blank lines.