Use `display-buffer` instead of `switch-to-buffer`
Fix wrong usage of -p form for variables
Stylistic fixes