Added validations

Redundant `self` detected.