Add rem mixin, minor cleanup