Code review feedback & updates