Review and debug