Improve variable name
Remove unused headers