Update notes for submitted changes

* Update attributes to be rubocop compliant
Update notes for submitted changes

* Update spec files to be rubocop compliant