Version1

code cleanup merge.