comments and mixin renaming