Minor fixes to the code documentation

Change-Id: Iddfecfea17109eeea604ef111d6f98ea8399cc96