Refactoring last minute label