fixed sass variables and if statements
removed optional tags for extends