Cosmetic changes
Attribute definition
Unused module deleted