Code review issues resolved.