Intelli Hot Plug: Fix eco /strict logic + cleanups to 80 char lines