ticket:3 made corrections according to comments