refactor: addressing review comments

4 jobs for issue/#340-default-language in 4 minutes and 2 seconds (queued for 3 seconds)