Some general cleanup. Fixing whitespace and spelling.