Minor modifications done