Code review fixed