restructured out sass, cleaned code