Further code/doc cleanup