Improve less variables