Cleanup and action improvements