Remove .scss, fix function