Add comments in rpe_panel_builder, more cleanup