Fixing lots of remaining spacing and formatting issues.