Refactor saving labels