removed unnecessary variables & mixins