Improvements according to review