cleaned up attr declarations