intelli_plug: code review clean up