Removed unneeded variable; better comments