more codereview work