Cleaned up mixins.