! clean up a few more things that scutinizer is complaining about

Signed-off-by: Spuds <spuds@spudsdesign.com>