JAL-3141 Made some more suggested changes from code review