Cleaned up code and formatted SCSS