code cleanup
merging