random formatting updates
merge master branch