Clean up pw()