cleaning of the code #54
code cleaning #54
match.arg in the checks #54