Refactor using @mixin + add all bullets