whitespace-cleanup
Use tramp vars rather than reinventing the wheel
Utilize built-in buffer name uniqification