better organization, further comments