class attribute should only appear once
Merge pull request #479 from Trott/more-minor-cleanup

class attribute should only appear once