refactor using bourbon neat bitter and refill for cleaner code