Some amendment according to the code review