Corrected mistakes due to comments