Minor cleanup and docs