Minor cleanup and use byte(b)/short(s)/float(p)