Some changes and comments added