JAL-3141 Made some suggested changes from code review