20140712 - CLI cleanup for simplfied PID, fewer data entries