Cleanup and Additions