Code clean-up per Giga Om Code Scanner
Code formatting
moved class UpgradeFirstAidUtil to inc directory and renamed it to something more appropriate