code cleanup
add ctrl_id