Fixed a bug with removing score features.  Renamed some local variables for clarity.