Renaming
Commenting the common mixins