Corrections made according to comments