! some more cleanup to make the subs more re-usable

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