Clarified some comments and structuring