General cleanup

Signed-off-by: robhol <email@robhol.net>