Clean-ups requested/suggested by Ben