Improve variables