Some cleaning of comments and indentation