Refactor removing double dividers