lots of big style changes

lots of big style changes from critique