Minor cleanup/documentation