Cleanup of Jira patch from feedback (thanks Fred)