Post review changes

Updates following review