Minor organization and spelling fixes