Merge "Minor cleanup of comments and code" into mnc-dev