Refactoring

Refactoring my sass to make it a bit neater :)