code cleanup
merge