organize come code
organize some code