Improve variable names and convention visibility