Improve default variables declaration