cleaned up a few items from Brian's comments