Cleaned up mixins