Cleanup 'cleanup' and add tilde-expansion