Renamed new variables to something sensible;
Removed unused variable in BitmapEncoder;