Improve variable name
Improve offense message