Improve variable declaration