cleanup and review