CR changes: removed extra new lines