come code cleanup and better example