Code review pass 2