Minor cleanup

Minor Clean up