Improve name of few variables