Use more checker functions and remove hardcoded language