Some changes in comments and style of code