Style changes

Going back over style decisions that did not work out.