code cleanup
merge fix