Cleanup

Eric, Here's a few minor clean up changes. Thanks