Refactor dots