SASS refactoring after code review.

TNL-900