Improve variable names
Small fix