7 Commits (cleanup-and-qr-code)