Refactor starbar