Amend code after review