Minor clean-ups before planned PR

Signed-off-by: Michael Vorburger <mike@vorburge>