Renamed variables, excluded unneeded mixins from main file.