Rename variable for consistency
Remove unused use statements