Code fixes in line with suggestions
2 files changed