Minor code and documentation modifications