Improve UX: #14