Cleanup and Added Smartass