Refactor label