Cleanups suggested by @mshonle