Smart Selection: Code Review comments