v/p/...: Some whitespace and code cleanup