Clean up CSS, use more idiomatic Sass