Remove string.len function call
Move fields in buffer table outside