Merge branch 'upstream/master' --squash
Cleaning up code