add more comment
organize