This should probably be static.
Remove an unneeded duplicate variable assignment.
Revert my unfinished refactoring commit I pushed by mistake.