refactoring, added kill-this-buffer