Review cleanup. 404 will be addressed separately.