Code clean
Improve attribute checks validations