Refactoring to move variables to head file
Adding more set mixins