Reformat attrs and validations

* Remove commented scope
* Remove whitespace and extra newlines