Cleanup mixin methods
More mixin cleanup and comments