light code cleanup
merge fix