Improvements following review