codereview suggestions for ef63048