Refactor get buffers list
Merge branch 'vi'