add refactoring changes

using bourbon/neat