Minor cleanup & doc improvements