Improve the code quality of Attribute.

3 jobs for improve-attribute in 6 minutes and 30 seconds (queued for 5 seconds)