Refactor labels to separated class