address jbellis JIRA comments