spelling and formatting
a bit more formatting plus cleanup