minor code cleanup
code cleanup and changes
checkpoint