cleaning up code
merge conflicts