Improve code variables