Code review pass 1