Code correction after review (part1)