Minor spelling fixes and cleanup