refactored code based on sass framework changes
general simplification