Made buffer handling prettier