small refactoring
language option