Added Code Review comments