Please make a JIRA for the refactoring.