Code review second iteration