VID-2079 removing loading graphic handling from render method and other code review feedback