Some Cleanup
Brian's Updates that he didn't commit