Code review points addressed