Move private methods to private methods section
Linting cleanup
Add attribute validator