Remove an unneeded variable
WiP: Add a comment about the more obvious approach