Variables names made consistent with constructor
Removes unnecessary new Buffer