Refactor some code

I note that you do not use bourbon mixins like `size`, `margin` and `padding`.
I apply some changes in your code. 

Hope it helps.