Fixing Review comments.
Removing if ... else