#1417, #1425 - Purification of code to satisfy the master base.  Hail Hyrda!
Signed-off-by:KProvance <kevin.provance@gmail.com>