Nazneen: removed extra lines.
Naz/Abhinav : Fixed the code quality issues.