Fixed up following review