Minor code and documentation enhancements