cleaned up project
merge