Code review ... partial