Added French support
Clean up