LAL-288: Made some readability changes