Cleaned up some comments and removed 'current buffer' from controller