minor cleanup
merge fix