use Sass 3.3, some cleanup and organization