16.5 - minor code cleanup
Sample code for 14.1