11/09/2014 -- additional cleanup and comments