Minor code and docs cleanup