Use nicer syntax, reformat error messages