code cleanup
merged