comments and better structuring