Code fixes in line with suggestions