Cleanup and additions