Code cleanup
merge files