Good practices improvement on new check