clean up
merged changes