Updates per BuffaloWill's comments
Updates per BuffaloWill's comments

MooseDojo/Serpico,ccammilleri/Serpico,ccammilleri/Serpico,LUTECH-TMS-CERT/EHAT-NG,MooseDojo/Serpico,ccammilleri/Serpico,LUTECH-TMS-CERT/EHAT-NG,LUTECH-TMS-CERT/EHAT-NG,MooseDojo/Serpico,LUTECH-TMS-CERT/EHAT-NG