Cleanup and other changes