APM_Control: tweak code layout and param descriptions