ticket:2 made corrections according to comments