Minor spelling fixes, cleanup