Simple review and bug fixed