Rework less variable