Minor clarity improvements on code and documentation.