A little clean up for the first effort