did a couple of style changes that I think might stick.. I know.. Bad practice. But last style change that will be done in this branch